Merge cherrypicks of ['googleplex-android-review.googlesource.com/31573116'] into security-aosp-24Q3-release. am: a11ffd8aac Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/32973928 Change-Id: I86b4791ac02946b25cf1c76a2f0fc8b0cade9c2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>